Skip to content

Fix typo adding non-gates to _collect_1q_runs() output#5740

Merged
mergify[bot] merged 1 commit into
Qiskit:stable/0.16from
mtreinish:fix-regression-collect_1q_runs
Jan 28, 2021
Merged

Fix typo adding non-gates to _collect_1q_runs() output#5740
mergify[bot] merged 1 commit into
Qiskit:stable/0.16from
mtreinish:fix-regression-collect_1q_runs

Conversation

@mtreinish
Copy link
Copy Markdown
Member

Summary

This commit fixes a bug introduced in the backport PR #5655. On the
current master branch the bugfix that was being backported relies on a
feature in newer versions of retworkx. Since we can't bump the minimum
retworkx version required on a stable branch that functionality was
rewritten in the dagcircuit class directly. However, that implementation
included a typo which is causing non-gates and atomic instructions to be
included in collected runs which is not correct behavior and causes
errors to be raised. This commit corrects the bug in the backport and
adds a test to ensure the regression is not present.

This is a direct commit to the stable branch and not a backport since
this bug is not present on master and was only introduced through a bad
backport.

Details and comments

Fixes #5736

@mtreinish mtreinish added priority: high Changelog: Fixed Add a "Fixed" entry in the GitHub Release changelog. labels Jan 28, 2021
@mtreinish mtreinish requested a review from a team as a code owner January 28, 2021 16:10
@mtreinish mtreinish force-pushed the fix-regression-collect_1q_runs branch from f711f00 to 44f78a9 Compare January 28, 2021 16:15
This commit fixes a bug introduced in the backport PR Qiskit#5655. On the
current master branch the bugfix that was being backported relies on a
feature in newer versions of retworkx. Since we can't bump the minimum
retworkx version required on a stable branch that functionality was
rewritten in the dagcircuit class directly. However, that implementation
included a typo which is causing non-gates and atomic instructions to be
included in collected runs which is not correct behavior and causes
errors to be raised. This commit corrects the bug in the backport and
adds a test to ensure the regression is not present.

This is a direct commit to the stable branch and not a backport since
this bug is not present on master and was only introduced through a bad
backport.

Fixes Qiskit#5736
@mtreinish mtreinish force-pushed the fix-regression-collect_1q_runs branch from 44f78a9 to 7d1bf56 Compare January 28, 2021 16:26
@mtreinish
Copy link
Copy Markdown
Member Author

Once this merges I will push a PR to prepare the 0.16.3 release

@mergify mergify Bot merged commit 4dfe3b6 into Qiskit:stable/0.16 Jan 28, 2021
@mtreinish mtreinish deleted the fix-regression-collect_1q_runs branch January 28, 2021 17:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Changelog: Fixed Add a "Fixed" entry in the GitHub Release changelog.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants